Improve terms and condition