add neccessary case
null check not needed
remove null checks