last bit of changes