ok, reverting back to working version