Got basic functionality of 4.0 and 4.1 back after the refactor