Use better paths and use less