model revisited, fix bugs courses passed