Merged my stuff