zeke's comit
Reconciling versions