Course Project - 2nd part