made some changes to stuff, ready for puder