updated/enhanced for new API