started working 416 refact