changes to always parse form