Works both (8/30)

Works both