updated code before shooting