edited some methods