Changed some internals