final dev update from sigwo