updates to working version