Added parts for initial data gathering