Maybe removing that will make it faster