re-structuring things