Added another rule
Little changes for brances inside functions in proper places