more adjustments and reverted to last commit