made some changes
deleted stuffs
argh