Copy/paste

Copy/paste from a project. Needs improvement.