Made 500 much faster