2nd course improvments