some minor edits - figuring best way of overriding parent