added better smartphone support