Update

-Made changes recommended by BEC creators
-Removed unnecessary code