End card fix WIP