My modified version of year 2 framework