Merge Cristian Libardo's eventhandling