All changes up to adding danny and jun
merging isas changes with mine