remaining issues added