Improve perfomace