Minor changes and stress test!