revert back to simple working version