new base inclusion
small code refactor in example app