changes to allow parsing