some fucking changes