lot of changes
forgot these