RC: #12 added navigation