bugs&features#8. unfinished
merge