Changes after testing stuff at condo