Some optimization for smaller devices + development helper added