Must fix this later - it makes little sense the way it is now