--GEP-53, code optimization
--removed duplicate code and function, GEP-53