Updated 02_functionality