Updated to reflect several changes