updated Diana and added shmebulock