little refactor - still not prepared for 1.8.7