changed some fields to public