updating to working version