Updated for iPhone 4