Made this easier to use