Last updates from testing