Simplified protocol + added space for robustness