removed everything for new testing