alpha2 testing
a little refactoring