removed else part