Updates

tests fine on local machine