CLSN-727 code review - jul 3rd
Excel changes/ only bucket remain