Changes from testing