Finished change of all over Object() implementation