Including some of Logan's changes