oops - better build