added supress-messages
fixed issues