A better version of ZAPP!