PR for code review

I think you can remove this condition if not needed? :bow: