codegened successfully, now need to make improvements