Just made it a bit better