Can now handle all