had to rename some properties