removed pw part, changed js