Updates and additions
Updates and additions