removed duplicate listener + comments