added files & fix build