Tested/fixed methods.