Adding Joshua's main