removed deprecated code
added id parse