Function properly (3/31)

Function properly