~ Fixing basic things
+ better performance