Temporary commit before resolving the const issue

Const functions removed