Upped version and changed inherit