Improved sections for Goal and Control