Prettification Done, adding extra functionality