Second commit of Stockler.