some changes to fix js