I just switched the order around here for readability, no functionality changes