Punctionation and 2x fix