Added safety stops

Needs edit treatment