adjusted code to work with latest snapshot of parent project