improve custom build