Drastically improve perfomance