Updated to week 5 specifications