Updated to reflect recent changes