UPDATE: Fixing methods and adding new ones.