Update Jack's changes to my code

Take Jack's changes and add them to 3vivkeb