Function properly (18/31)

Function properly