Methods updated and more...