Improved feedforward handling