Added safety limits