Added safety limits'