Major hack removal, allow burst/charge limiting