Part B fully working