inline check
merge fix and js update