added item to solution, fixed overridden methods