Yea, we can always make this change later - piece by piece :)