New class and renamed some variavles