Edit methods
Error fixing