updated dad - removed statics