added gun and finish