working on #135 + bonus