Solved Issue. #3 @prtksxna is this fine?