Added 16, 20; clean up