took out conflicting js for now