adapted more issues to new abstract superclass