Updated radargun with fixes done on testing environment