eheh, this is what I left out when I refactored