I think you did implement it... I commented on it below I think.