WORK IN PROGRESS back to saftey