Sencond modifications for testing