code reviewed and aligned with future changes