Updated with information from testing