More source calculation
Incoporate agda definitions