quite a bit of updates