Changes after some stress tests