Merged with felix and updates for indigo