Modified functions signatures to use boolean parameters