Changed behaviors from Objects to Functions