added more expressions and statements