Moving helper functions to bottom
Updated access controls