Updates to handle more diff situations