Improving global functions