Final code modifications.