Updated Project With Complete Code