Fixed hub 1 and subcases

hub 2 remains