some final?? updates