Forgot to add/check in this new class again!