Feature/advance deadline

For review