Wooops, lazy refactoring.