Updated neils stuff