changed datastore initiation