Latest working project. Fix issues on iOS8