You are right, will follow the pattern you proposed.