Change to use combine js