updated to not depend on shared bundle