add swap binaries and remove force flag