New version, now that this settings bug is fixed