fixed methods
merged yipu and cesar changes