make it distribution friendly