Fixed and improved plan and profile