New class - Better code.