Code is in correct class now