Minor changes. Need to test...