building on a branch from our innoevent group (my part of the code)