updated back end logic
conflicts resolved