Added theorical support for Taps