changes from florin-wrk on Fri Apr 19 23:33:00 EEST 2013