a big update of the latest changes