Redoing stuff to work on 666