Tweak tilt support
Refactor partial lookup