updated to current situation