#248 more changes to required files, I guess this will be a moving target for a while