Changed ivars to properties