updated to test new methods