Updated parsing methode (friends)