Remove this, will try to make it faster