Added Objects and converted func. to Methods