Partly implement featured asked in #11