Made pickup modes static and other stuff final