Import changes from Brandon's 1.5