rearranged some js-functions