Moved some code around...