Merged how everything should be