Work to get the plans working properly