removed elseblock