Further improves indentation system