Finish section 3
Fix for guard not working