updated to use 1.1.0 inheritance