updates to work in class
Merge pull request #1 from jacshfr/afterClass

updates to work in class