modified depending on Rizwin comments