now with remover and better API