Another attempt to accomodate for mobile