Updated branch, thanks for the feedback