Ok hopefully last change for now. Rearrainged afternoon