Final code changes