added return; to my functions