Added more calculation of gamma attack, q critical