#466 ready for final test, few changes needed