Simpler concept implemented
Further fixes.