beta version working with OGS