Some more modifications