Added separate listener for viewer