REstore simpler manipulation for a performance boost
1.2.7