updated shared code