refactored -- Christian should be happy