updates + add commented 16357 code

Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>