Updated && || finished code