Adding some tricks from aurelio.net