last revision of stuff for nico!