Amended index & yaml