Converted to WPI template
Merged