Adds first attempt to make it look better