Basic event bullet
Merged changes