Final code revision