Bringing my changes and the changes to Parsely together.