tidied display
vlad changes
merged vlads changes