Last things for release 1