Adding TAP and SPECFIT