Revert back to working version