still trying to fix the javascript issues