Added version with controller - no working very well