Working on making guns better