Merged a few things