here are the last changes for now