made changes but have type issues