done with all basics
changes