Added functionality for checking buddy