Looks like there is a new way of doing things. Gotta merge some day