Made minor changes to make functions visible