Completed some methods