latest changes, publish ready