try to make things faster