Old uncommited stuff from 1.5 feature branch