Added west compatability. It's spikey, still working on that