Graphics Update

Punch issue still remains.