Additional impl for week 7