Combine some more code