so we should remove the if-statement?