starting to streamline to personal version