before presentation
add icon, refactor code