code review on 12/07/2013