add listen function
add listen function content
add new ba
fix conflicts