Final Version as of 2pm