added in some parts to properties