almost ready for update