Reverted and working