trying this again, adding all dependencies in master