This should have been parameterized