added bullets handling