altered early return fallthroughs
Updated to reflect changes to fallthrough