Minor changes (adding override keyword)