#add - start showing
#update - tidy and refactor