Changed lookup a bit.