Moved code around a little