Made it more useful and clever