Adapted remaining chapters for TAPAS