=removed a couple of if statemnts