ticket:9 Updated script