reverted some commits