Got rid of all the unneeded @Overrides
Changed Version