Finished up all change requests made by Indspire team in March 7th Meeting