working on enhancement of js