new way of handling builds