Function properly (16/31)

Function properly