Change variables names and conditional statement