Updated to new tap syntax