slightly better build setup!