Reverted and commited all together