adding changes from Sean