Finalized for milestone 3b