Some even more changes to heppen now and later