Two commit back of story 8