working commit 04/06/2013