Giancarlo improvements