Optimize a little more mobile