Updated additions from testing branch