More tweaking and fixed related saving issue