add urgent todo. fix before merge