added operation with conditionlals but still figuring out the problem