Moved condition statement