added new listeners and new design