adding resolve for loading