More comments from help from Sasa