Changed to TS
Removed JS