merging master with irme's defense