updated common and utils