added properties and stuff