mobile enhancments including #6