minor modifications to main