added stuff to datamation for better test cases maybe?