fixed private methods issues