Squashed commits
removed one virtual function
Removed one virtual function