updated for right navigation in Client libs