Some stupid changes