js fix and new adaptation