A lot of changes as needed. Forgot what all I did.