Restructured to give aspects some more control if needed