Updating code.
Added a few methods.