menu + resent changes by Ivo