Moved code around some more