more changements
to fast :p