Moved some junk around