ADDED: more visual changes