Ready for testing
Forgot to fix the time for filename
Fixed mistakes