Moved around bits and pieces