Added zoom and stretch