This repo is so messed up, but I think I need these changes... :/