Moved around after including commander