Little changes + 30st private property