Edits from hackbright computer