Merged missing code