fixes
subjects first implementation