added listeners
merge