Done latest changes