Made it nicer