removed more things
Added things back