changes from florin-wrk on Sat Apr 20 23:49:00 EEST 2013