Merged my stub