working version for test submit