replaced all (var) with (public)