Wills changes + some