late commit, bunch of changes
pictures