some tweaks, add 11