updated for js conflict