Merged some methods together