revert back to working code