Modified helper functions for the client
Modified helper functions for the client
Merge branch 'client'