Added bidirectionality, v1.0