Review of current code