adding parser code and repackaging