Moved method to more appropriate location