Updated to reflect Swan contributions