Should probably adjust the code comments too