not crashing prepare to change for new functions names