OK ready to integrate PatrikE code