updated for current public code