Last commit befor essential changes