Updated logic to be uniform