methodOverride finished and improvements