tweak to simplify parsing