Finished genericisation