final deploy refinaments