updating to latest (still without remove working)