Updating with stuff from APM term