changes from florin-wrk on Sat Apr 20 00:24:15 EEST 2013