back to working version, not sure when it got messed up