deleted useless things
changed design