updated mocks and design after first appvisory