need to fix parsing