Collapsed some methods