Added missing requirements pointed out by Joe