Based edit (8/25)

Based edit