last changes for good