here is quite some code in comments - still needed?