More testing
Updated main