final deploy refinaments 2