usage improvements