Completed some methods...