Merged some methods