Now hides extra functions better