Adding implementation details
Changes related to feedback received from Dan