simplified build a little bit