go back to old way - need to fix inheritance