My lastest changes before merge