Replaced S.o.p with Assert