updated shared code (added more)