fixed methods, now work