looks like code repeat... can this be moved to the super class?