Got rid of j->gj etc. switch...