Make yi more manageable