Finish adding Byung's additions