Safety Commit

Making some changes in the method now