Merged two methods