added nova
cleaned up mixup