replacing with current working version