adding some modifications to geometry parser