updated 2 methods