:+1: to these changes, I like it better split up.