Finally got things merged.....