More work on AGGLPlanner