More work on manual param section