Pulling Landon's changes