all changes from old dev machine