Last changes made - iOS 6 compatible