Commented some methods