updated for combo 0.3.6