Updated definitions Sat May 25 15:14:00 CEST 2013