This commit will be a ton smoother