And forgot to get rid of the deprecated apply statements, my bad