Tested option 2 and made some last modifications.