returning to the version that works