index changed to look okay on phone
fixed merge conflict