More consistency, added title