Updated collision to work with generator