last changes by Kris Kowal