(close GH-1) fix topics 6, 7 and 8