Added the ability to change the institute and location.