more work adding back missing properties