still fixing deadline issue