added data store code and check if we can commit...