Changes for including event and js