Fixed & Finalizing Project