Added more fun
cleaner code