Function properly (7/31)

Function properly