Updated files from ias15 branch