Full changes AB :package:

(After Brandon)