made logic more verbose