Main codes for master when moved to Git