alot of working changes
clean