Checked functionality, due change in code structure