Merged block listener into main listener