updated to remove testing logic