reverted some code and started again