Last changes on Plan Panel