reverted to earlier version and applied last changes