Added Swan's stuff