minor changes to my codez in guardz
fixed merge conflicts