Reverting back to working version for now