commiting the code not optimized to debug on production