minor modifications - commit final