Adding Brendan modifications