Sorted out some requires