Updated with cp option