Added more calculation of gamma critical and gamma attack