Making it reflect reality a little more