still trying to fix js