updated to go faster