Changed some inherit stuff