My changes to the swiftclient utility