some changes, removed js