improved internals, checking if it is working