Shorten latency (require refactoring)