Removed router parameter;