updated for testing with whole rigt