Improved usage