fixed events
better implementation of helpers