Revert "Revert "added a few lines""

This reverts commit d845275b9e6179df3e41935140bb6b0851f2bcff.