Changed the signature of some functions