changes in Helper class