Changes to Dataconnection and Main