Add in Byung's changes