last changes made, thing ~works