Continue to push towards a better implementation