Updated for i686 arch