added partial for common code