Added parse properly this time