merged with branch format
Screenshots updated