added custom blocks and moved block events there