Updates by Buckman