Hajj is the fifth pillar of Islam; it is the greatest symbol of unity for all Muslims. The increasing numbers of pilgrims every year and their sincere desire to visit the House of Allah- Al-Haram- affected its capacity gradually, so it is a must to think about a well planned expansion of the House of Allah. The Tawaf circulating the Kahba is one of the most important activity that take place in the House of Allah, nevertheless it is one of the most difficult activity due to massive crowed movement resulted from the unbalanced users capacity of the Tawaf area and Al-Masaa new area at the peak times. Therefore this study focused on diagnosing the needs, potential, and possible architectural solutions to increase the user's capacity of the Tawaf area with respect to the current and future needs. The study ended up with an architecture proposal that increased the user's capacity of the Tawaf area with 119%, main while the proportion of the proposed new structures did not exceed 6.6% of the Haram total area. The emergency problems, shading and directing the solution towards sustainability was also main concerns in the proposal. The proposal also make use of the added structures elements, it was utilized as a digital stream towards converting the Haram to a smart building which all of its systems work together and can be remotely controlled and connected to the security systems of the Holy Capital of all Muslims, Makah