tweaks by Gin