Changed some functions to properties