Improved js
Improved teaches