Redid code

everything is working