Eden/controller improvements