Updated to reflect most recent changes