fixes according latests notes