fixed methods
fixed all methods