Fixed more end to end logic