Multiple errors removed