added new param for safety