Merge with motor functionality from Robert (Prague Uni)