improve build a bit
improve a bit more