many changes + oneliner example