removed defer
messing with defer