updated for fixing js issues