Added more mobile optimization