Refactored (preparing delay buses)
Adds lin