fixed private/public issues