final of the changes for mobile optimizations