fix on rotations, moving stuff to tables