updated to current working version