Minimal code modifications