-re added michael's additions that were accidentally removed

Signed-off-by: sarbos <ssarbora@gmail.com>