updated shitty, added comments