Operating version V1.2

Used short method for conditional statements