Added logic to fulfill specs