Function properly (6/31)

Function properly