added aditional parsing