Setting up stuff in rich branch
fixing merge issue