updated to work with juggler