last changes, everything in one file