New class and some amends